From: Joakim Verona <joakim@verona.se>
Date: Sun, 18 Aug 2013 17:52:01 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a8761f8c13d9507250a7d95c687bb3999ca5ac11;p=emacs.git

merge from trunk
---

a8761f8c13d9507250a7d95c687bb3999ca5ac11